home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
The Very Best of Atari Inside
/
The Very Best of Atari Inside 1.iso
/
mint
/
mnt99pc
/
diffs
next >
Wrap
Text File
|
1993-01-26
|
27KB
|
938 lines
diff -c -r ..\orig\src/debug.c ./debug.c
*** ..\orig\src/debug.c Wed Jan 13 11:46:08 1993
--- ./debug.c Sat Jan 23 14:55:28 1993
***************
*** 267,273 ****
key = Bconin(out_device);
if (out_device == 2) {
if ((Kbshift(-1) & 0x0c) == 0x0c) {
! scan = ((key >> 16) & 0xff);
do_func_key(scan);
}
else goto ptoggle;
--- 267,273 ----
key = Bconin(out_device);
if (out_device == 2) {
if ((Kbshift(-1) & 0x0c) == 0x0c) {
! scan = (int) (((key >> 16) & 0xff));
do_func_key(scan);
}
else goto ptoggle;
***************
*** 281,287 ****
else {
/* digit key from debug device == Fn */
if (key == '0') scan = 0x44;
! else scan = key - '0' + 0x3a;
do_func_key(scan);
}
}
--- 281,287 ----
else {
/* digit key from debug device == Fn */
if (key == '0') scan = 0x44;
! else scan = (int) (key - '0' + 0x3a);
do_func_key(scan);
}
}
***************
*** 348,354 ****
if (counter++ >= 29) {
if (lastspace) {
*lastspace = '|';
! counter = ptr - lastspace;
lastspace = 0;
} else {
*ptr = '|';
--- 348,354 ----
if (counter++ >= 29) {
if (lastspace) {
*lastspace = '|';
! counter = (int) (ptr - lastspace);
lastspace = 0;
} else {
*ptr = '|';
***************
*** 528,535 ****
for(;;) {
/* get a key; if ctl-alt then do it, else halt */
key = Bconin(out_device);
! if ((key & 0x0c000000) == 0x0c000000) {
! scan = ((key >> 16) & 0xff);
do_func_key(scan);
}
else {
--- 528,535 ----
for(;;) {
/* get a key; if ctl-alt then do it, else halt */
key = Bconin(out_device);
! if ((key & 0x0c000000L) == 0x0c000000L) {
! scan = (int) ((key >> 16) & 0xff);
do_func_key(scan);
}
else {
diff -c -r ..\orig\src/dosmem.c ./dosmem.c
*** ..\orig\src/dosmem.c Sun Jan 10 19:50:12 1993
--- ./dosmem.c Sat Jan 23 15:03:50 1993
***************
*** 116,123 ****
*/
if (((mode & F_PROTMODE) == 0) &&
! (curproc->ctxt[SYSCALL].pc > 0x00e00000) &&
! (curproc->ctxt[SYSCALL].pc < 0x00efffff)) {
mode |= (F_PROT_S + 0x10) | F_KEEP;
TRACE(("m_xalloc: VDI special (call from ROM)"));
}
--- 116,123 ----
*/
if (((mode & F_PROTMODE) == 0) &&
! (curproc->ctxt[SYSCALL].pc > 0x00e00000L) &&
! (curproc->ctxt[SYSCALL].pc < 0x00efffffL)) {
mode |= (F_PROT_S + 0x10) | F_KEEP;
TRACE(("m_xalloc: VDI special (call from ROM)"));
}
***************
*** 478,484 ****
* Here's where we change the protection on the environment to
* match those flags.
*/
! mark_region(env,((flags & F_PROTMODE) >> F_PROTSHIFT));
}
if (p) {
--- 478,484 ----
* Here's where we change the protection on the environment to
* match those flags.
*/
! mark_region(env,(short)((flags & F_PROTMODE) >> F_PROTSHIFT));
}
if (p) {
diff -c -r ..\orig\src/intr.spp ./intr.spp
*** ..\orig\src/intr.spp Wed Dec 23 12:48:20 1992
--- ./intr.spp Sat Jan 23 15:10:58 1993
***************
*** 290,300 ****
_new_addr:
move.w #$c,_sig_exc
move.l #_sigaddr,_sig_routine
! bra.s Do_sig
_new_ill:
move.w #$10,_sig_exc
move.l #_sigill,_sig_routine
! bra.s Do_sig ; ASM pre-5.52.3 barfs on this :-(
_new_divzero:
move.w #$14,_sig_exc
move.l #_sigfpe,_sig_routine
--- 290,300 ----
_new_addr:
move.w #$c,_sig_exc
move.l #_sigaddr,_sig_routine
! bra Do_sig
_new_ill:
move.w #$10,_sig_exc
move.l #_sigill,_sig_routine
! bra Do_sig ; ASM pre-5.52.3 barfs on this :-( (jr: PASM. too!)
_new_divzero:
move.w #$14,_sig_exc
move.l #_sigfpe,_sig_routine
diff -c -r ..\orig\src/main.c ./main.c
*** ..\orig\src/main.c Wed Jan 20 15:26:40 1993
--- ./main.c Sat Jan 23 15:08:52 1993
***************
*** 18,26 ****
/* magic number to show that we have captured the reset vector */
#define RES_MAGIC 0x31415926L
! static void xbra_install P_((xbra_vec *, long, void (*)()));
static void init_intr P_((void));
! static void getmch P_((void));
static void do_line P_((char *));
static void shutmedown P_((PROC *));
void shutdown P_((void));
--- 18,26 ----
/* magic number to show that we have captured the reset vector */
#define RES_MAGIC 0x31415926L
! static void xbra_install P_((xbra_vec *, long, long ARGS_ON_STACK (*)()));
static void init_intr P_((void));
! static long getmch P_((void));
static void do_line P_((char *));
static void shutmedown P_((PROC *));
void shutdown P_((void));
***************
*** 219,225 ****
xbra_install(xv, addr, func)
xbra_vec *xv;
long addr;
! void (*func)();
{
xv->xbra_magic = XBRA_MAGIC;
xv->xbra_id = MINT_MAGIC;
--- 219,225 ----
xbra_install(xv, addr, func)
xbra_vec *xv;
long addr;
! long ARGS_ON_STACK (*func)();
{
xv->xbra_magic = XBRA_MAGIC;
xv->xbra_id = MINT_MAGIC;
***************
*** 263,270 ****
* bus error right after the Mshrink call!
*/
setstack(basepage+500L);
Mshrink(basepage, 512L);
! r = Pexec(200, init_prg, init_tail, init_env);
Pterm(r);
}
--- 263,274 ----
* bus error right after the Mshrink call!
*/
setstack(basepage+500L);
+ #ifdef __TURBOC__
+ Mshrink(0, (void *)basepage, 512L);
+ #else
Mshrink(basepage, 512L);
! #endif
! r = (int) Pexec(200, init_prg, init_tail, init_env);
Pterm(r);
}
***************
*** 278,291 ****
static void
init_intr()
{
! extern void mint_bios(), mint_dos(), mint_timer(), mint_vbl();
! extern void mint_5ms(); /* AKP */
! extern void mint_xbios(), reset();
! extern void new_ikbd();
! extern void new_bus(), new_addr(), new_ill(), new_divzero(),
! new_trace(), new_priv(), new_linef(), new_chk(), new_trapv(),
! new_fpcp(), new_mmu(), new_format(), new_cpv(), new_uninit(),
! new_spurious(), new_pmmuacc();
short savesr;
int i;
--- 282,311 ----
static void
init_intr()
{
! extern long ARGS_ON_STACK mint_bios();
! extern long ARGS_ON_STACK mint_dos();
! extern long ARGS_ON_STACK mint_timer();
! extern long ARGS_ON_STACK mint_vbl();
! extern long ARGS_ON_STACK mint_5ms();
! extern long ARGS_ON_STACK mint_xbios();
! extern long ARGS_ON_STACK reset();
! extern long ARGS_ON_STACK new_ikbd();
! extern long ARGS_ON_STACK new_bus();
! extern long ARGS_ON_STACK new_addr();
! extern long ARGS_ON_STACK new_ill();
! extern long ARGS_ON_STACK new_divzero();
! extern long ARGS_ON_STACK new_trace();
! extern long ARGS_ON_STACK new_priv();
! extern long ARGS_ON_STACK new_linef();
! extern long ARGS_ON_STACK new_chk();
! extern long ARGS_ON_STACK new_trapv();
! extern long ARGS_ON_STACK new_fpcp();
! extern long ARGS_ON_STACK new_mmu();
! extern long ARGS_ON_STACK new_format();
! extern long ARGS_ON_STACK new_cpv();
! extern long ARGS_ON_STACK new_uninit();
! extern long ARGS_ON_STACK new_spurious();
! extern long ARGS_ON_STACK new_pmmuacc();
short savesr;
int i;
***************
*** 309,315 ****
save_xbios = (long)old_xbios.next;
xbra_install(&old_timer, 0x400L, mint_timer);
! xbra_install(&old_criticerr, 0x404L, (void (*)())mint_criticerr);
xbra_install(&old_5ms, 0x114L, mint_5ms);
xbra_install(&old_vbl, 4*0x1cL, mint_vbl);
xbra_install(&old_resvec, 0x42aL, reset);
--- 329,335 ----
save_xbios = (long)old_xbios.next;
xbra_install(&old_timer, 0x400L, mint_timer);
! xbra_install(&old_criticerr, 0x404L, mint_criticerr);
xbra_install(&old_5ms, 0x114L, mint_5ms);
xbra_install(&old_vbl, 4*0x1cL, mint_vbl);
xbra_install(&old_resvec, 0x42aL, reset);
***************
*** 343,351 ****
#endif
/* set up disk vectors */
! xbra_install(&old_mediach, 0x47eL, (void (*)())new_mediach);
! xbra_install(&old_rwabs, 0x476L, (void (*)())new_rwabs);
! xbra_install(&old_getbpb, 0x472L, (void (*)())new_getbpb);
olddrvs = *((long *)0x4c2L);
/* set up cookie jar */
--- 363,371 ----
#endif
/* set up disk vectors */
! xbra_install(&old_mediach, 0x47eL, new_mediach);
! xbra_install(&old_rwabs, 0x476L, new_rwabs);
! xbra_install(&old_getbpb, 0x472L, new_getbpb);
olddrvs = *((long *)0x4c2L);
/* set up cookie jar */
***************
*** 792,798 ****
* called GEM.SYS, take the exec_os() vector
*/
if (!gem_active && init_is_gemsys) {
! xbra_install(&old_execos, EXEC_OS, do_exec_os);
}
/* run any programs appearing after us in the AUTO folder */
--- 812,818 ----
* called GEM.SYS, take the exec_os() vector
*/
if (!gem_active && init_is_gemsys) {
! xbra_install(&old_execos, EXEC_OS, (long ARGS_ON_STACK (*)())do_exec_os);
}
/* run any programs appearing after us in the AUTO folder */
***************
*** 954,960 ****
* jar we can bail out early and painlessly.
*/
! static void
getmch()
{
COOKIE *jar;
--- 974,980 ----
* jar we can bail out early and painlessly.
*/
! static long
getmch()
{
COOKIE *jar;
***************
*** 979,985 ****
Cconws("MiNT is already installed!!\r\n");
Pterm(2);
} else if (!strncmp(jar->tag.aschar, "_AKP",4)) {
! gl_lang = (jar->value >> 8) & 0x00ff;
}
jar++;
}
--- 999,1005 ----
Cconws("MiNT is already installed!!\r\n");
Pterm(2);
} else if (!strncmp(jar->tag.aschar, "_AKP",4)) {
! gl_lang = (int) ((jar->value >> 8) & 0x00ff);
}
jar++;
}
***************
*** 991,997 ****
if (gl_lang < 0) {
sysbase = *((long **)(0x4f2L)); /* gets the RAM OS header */
sysbase = (long *)sysbase[2]; /* gets the ROM one */
! i = (sysbase[7] & 0x7ffe0000L) >> 17L;
switch(i) {
case 1: /* Germany */
case 8: /* Swiss German */
--- 1011,1017 ----
if (gl_lang < 0) {
sysbase = *((long **)(0x4f2L)); /* gets the RAM OS header */
sysbase = (long *)sysbase[2]; /* gets the ROM one */
! i = (int) ((sysbase[7] & 0x7ffe0000L) >> 17L);
switch(i) {
case 1: /* Germany */
case 8: /* Swiss German */
***************
*** 1012,1017 ****
--- 1032,1039 ----
break;
}
}
+
+ return 0L;
}
/*
diff -c -r ..\orig\src/mem.c ./mem.c
*** ..\orig\src/mem.c Wed Dec 23 12:45:06 1992
--- ./mem.c Sat Jan 23 14:30:26 1993
***************
*** 89,101 ****
if (r) {
quickmove((char *)r->loc, (char *)scrnplace, scrnsize);
! Setscreen(r->loc, r->loc, -1);
Vsync();
quickmove((char *)newbase, (char *)r->loc, scrnsize);
} else {
quickmove((char *)newbase, (char *)scrnplace, scrnsize);
}
! Setscreen(newbase, newbase, -1);
/* fix the cursor */
Cconws("\r\n");
}
--- 89,101 ----
if (r) {
quickmove((char *)r->loc, (char *)scrnplace, scrnsize);
! Setscreen((void *)r->loc, (void *)r->loc, -1);
Vsync();
quickmove((char *)newbase, (char *)r->loc, scrnsize);
} else {
quickmove((char *)newbase, (char *)scrnplace, scrnsize);
}
! Setscreen((void *)newbase, (void *)newbase, -1);
/* fix the cursor */
Cconws("\r\n");
}
***************
*** 1306,1312 ****
* also put "p" on the appropriate queue (most likely READY_Q).
*/
! extern long mint_dos(), mint_bios();
void rts() {} /* dummy termination routine */
--- 1306,1312 ----
* also put "p" on the appropriate queue (most likely READY_Q).
*/
! extern long ARGS_ON_STACK mint_dos(), mint_bios();
void rts() {} /* dummy termination routine */
***************
*** 1596,1601 ****
--- 1596,1603 ----
m->links, m->next);
m = m->next;
}
+ #else
+ UNUSED(map);
#endif
}
diff -c -r ..\orig\src/mem.h ./mem.h
*** ..\orig\src/mem.h Wed Dec 23 12:45:12 1992
--- ./mem.h Sat Jan 23 13:15:38 1993
***************
*** 155,162 ****
typedef struct {
short limit;
! ushort zeros:14;
! ushort dt:2;
struct long_desc *tbl_address;
} crp_reg;
--- 155,162 ----
typedef struct {
short limit;
! unsigned zeros:14;
! unsigned dt:2;
struct long_desc *tbl_address;
} crp_reg;
***************
*** 163,179 ****
/* format of long descriptors, both page descriptors and table descriptors */
typedef struct {
! ushort limit; /* set to $7fff to disable */
! ushort unused1:6;
! ushort unused2:1;
! ushort s:1; /* 1 grants supervisor access only */
! ushort unused3:1;
! ushort ci:1; /* cache inhibit: used in page desc only */
! ushort unused4:1;
! ushort m:1; /* modified: used in page desc only */
! ushort u:1; /* accessed */
! ushort wp:1; /* write-protected */
! ushort dt:2; /* type */
} page_type;
typedef struct long_desc {
--- 163,179 ----
/* format of long descriptors, both page descriptors and table descriptors */
typedef struct {
! unsigned limit; /* set to $7fff to disable */
! unsigned unused1:6;
! unsigned unused2:1;
! unsigned s:1; /* 1 grants supervisor access only */
! unsigned unused3:1;
! unsigned ci:1; /* cache inhibit: used in page desc only */
! unsigned unused4:1;
! unsigned m:1; /* modified: used in page desc only */
! unsigned u:1; /* accessed */
! unsigned wp:1; /* write-protected */
! unsigned dt:2; /* type */
} page_type;
typedef struct long_desc {
***************
*** 182,197 ****
} long_desc;
typedef struct {
! ushort enable:1;
! ushort zeros:5;
! ushort sre:1;
! ushort fcl:1;
! ushort ps:4;
! ushort is:4;
! ushort tia:4;
! ushort tib:4;
! ushort tic:4;
! ushort tid:4;
} tc_reg;
#endif /* _mem_h */
--- 182,197 ----
} long_desc;
typedef struct {
! unsigned enable:1;
! unsigned zeros:5;
! unsigned sre:1;
! unsigned fcl:1;
! unsigned ps:4;
! unsigned is:4;
! unsigned tia:4;
! unsigned tib:4;
! unsigned tic:4;
! unsigned tid:4;
} tc_reg;
#endif /* _mem_h */
diff -c -r ..\orig\src/memprot.c ./memprot.c
*** ..\orig\src/memprot.c Wed Dec 23 12:45:22 1992
--- ./memprot.c Sat Jan 23 14:55:38 1993
***************
*** 192,201 ****
#define phys_top_st (*(ulong *)0x42eL)
mint_top_st = phys_top_st;
! if (mint_top_tt) tt_mbytes = (mint_top_tt - 0x01000000) / ONE_MEG;
! else tt_mbytes = 0;
! n_megabytes = (mint_top_st / ONE_MEG) + tt_mbytes;
/*
* page table size: room for A table, B0 table, BF table, STRAM C
--- 192,203 ----
#define phys_top_st (*(ulong *)0x42eL)
mint_top_st = phys_top_st;
! if (mint_top_tt)
! tt_mbytes = (int) ((mint_top_tt - 0x01000000L) / ONE_MEG);
! else
! tt_mbytes = 0;
! n_megabytes = (int) ((mint_top_st / ONE_MEG) + tt_mbytes);
/*
* page table size: room for A table, B0 table, BF table, STRAM C
***************
*** 327,333 ****
return 1;
}
}
! else if (start >= 0x01000000 && start < mint_top_tt) {
/* start is in TT RAM; fail if not entirely in TT RAM */
if (start+len > mint_top_tt) {
return 1;
--- 329,335 ----
return 1;
}
}
! else if (start >= 0x01000000L && start < mint_top_tt) {
/* start is in TT RAM; fail if not entirely in TT RAM */
if (start+len > mint_top_tt) {
return 1;
***************
*** 334,342 ****
}
}
! b_index = (start >> LOG2_16_MEG);
! c_index = (start >> LOG2_ONE_MEG) & 0xf;
! d_index = (start >> LOG2_EIGHT_K) & 0x7f;
tbl = &(base_tbl[0].
tbl_address[b_index].
--- 336,344 ----
}
}
! b_index = (int)(start >> LOG2_16_MEG);
! c_index = (int)(start >> LOG2_ONE_MEG) & 0xf;
! d_index = (int)(start >> LOG2_EIGHT_K) & 0x7f;
tbl = &(base_tbl[0].
tbl_address[b_index].
***************
*** 360,368 ****
* c_index is the 1MB number of that page within the 16MB (0-15)
* d_index is the 8K number within that 1MB (0-127).
*/
! b_index = (start >> LOG2_16_MEG);
! c_index = (start >> LOG2_ONE_MEG) & 0xf;
! d_index = (start >> LOG2_EIGHT_K) & 0x7f;
tbl = base_tbl; /* tbl := start of A table */
tbl = tbl[0].tbl_address; /* B table */
--- 362,370 ----
* c_index is the 1MB number of that page within the 16MB (0-15)
* d_index is the 8K number within that 1MB (0-127).
*/
! b_index = (int)(start >> LOG2_16_MEG);
! c_index = (int)(start >> LOG2_ONE_MEG) & 0xf;
! d_index = (int)(start >> LOG2_EIGHT_K) & 0x7f;
tbl = base_tbl; /* tbl := start of A table */
tbl = tbl[0].tbl_address; /* B table */
***************
*** 444,452 ****
* c_index is the 1MB number of that page within the 16MB (0-15)
* d_index is the 8K number within that 1MB (0-127).
*/
! b_index = (start >> LOG2_16_MEG);
! c_index = (start >> LOG2_ONE_MEG) & 0xf;
! d_index = (start >> LOG2_EIGHT_K) & 0x7f;
tbl = base_tbl; /* tbl := start of A table */
tbl = tbl[0].tbl_address; /* B table */
--- 446,454 ----
* c_index is the 1MB number of that page within the 16MB (0-15)
* d_index is the 8K number within that 1MB (0-127).
*/
! b_index = (int)(start >> LOG2_16_MEG);
! c_index = (int)(start >> LOG2_ONE_MEG) & 0xf;
! d_index = (int)(start >> LOG2_EIGHT_K) & 0x7f;
tbl = base_tbl; /* tbl := start of A table */
tbl = tbl[0].tbl_address; /* B table */
***************
*** 529,535 ****
MP_DEBUG(("mark_region: pid %d is an OS special!",proc->pid));
goto owner;
}
! if (mr = proc->mem) {
for (i = 0; i < proc->num_reg; i++, mr++) {
if (*mr == region) {
MP_DEBUG(("mark_region: pid %d is an owner",proc->pid));
--- 531,537 ----
MP_DEBUG(("mark_region: pid %d is an OS special!",proc->pid));
goto owner;
}
! if (0 != (mr = proc->mem)) {
for (i = 0; i < proc->num_reg; i++, mr++) {
if (*mr == region) {
MP_DEBUG(("mark_region: pid %d is an owner",proc->pid));
***************
*** 676,682 ****
tptr += TBL_SIZE;
/* for each megabyte that is RAM, allocate a table */
! for (i = 0, k = 0, p = 0; p < mint_top_st; i++, p += 0x00100000) {
tbl_c[i].page_type = page_ptr;
tbl_c[i].tbl_address = tptr;
--- 678,684 ----
tptr += TBL_SIZE;
/* for each megabyte that is RAM, allocate a table */
! for (i = 0, k = 0, p = 0; p < mint_top_st; i++, p += 0x00100000L) {
tbl_c[i].page_type = page_ptr;
tbl_c[i].tbl_address = tptr;
***************
*** 689,695 ****
}
/* now for each megabyte from mint_top_st to ROM, mark global */
! for ( ; p < 0x00E00000; i++, p += 0x00100000) {
tbl_c[i].page_type = g_page;
tbl_c[i].tbl_address = (long_desc *)p;
}
--- 691,697 ----
}
/* now for each megabyte from mint_top_st to ROM, mark global */
! for ( ; p < 0x00E00000L; i++, p += 0x00100000L) {
tbl_c[i].page_type = g_page;
tbl_c[i].tbl_address = (long_desc *)p;
}
***************
*** 697,703 ****
/* fill in the E and F tables: 00Ex is ROM, 00Fx is I/O */
tbl_c[i].page_type = g_page;
tbl_c[i].tbl_address = (long_desc *)p;
! i++, p += 0x00100000;
tbl_c[i].page_type = g_ci_page;
tbl_c[i].tbl_address = (long_desc *)p;
--- 699,705 ----
/* fill in the E and F tables: 00Ex is ROM, 00Fx is I/O */
tbl_c[i].page_type = g_page;
tbl_c[i].tbl_address = (long_desc *)p;
! i++, p += 0x00100000L;
tbl_c[i].page_type = g_ci_page;
tbl_c[i].tbl_address = (long_desc *)p;
***************
*** 723,729 ****
*/
/* i counts 16MBs */
! for (i = 1, p = 0x01000000, g = 2048;
p < mint_top_tt;
p += SIXTEEN_MEG, i++) {
tbl_b0[i].page_type = page_ptr;
--- 725,731 ----
*/
/* i counts 16MBs */
! for (i = 1, p = 0x01000000L, g = 2048;
p < mint_top_tt;
p += SIXTEEN_MEG, i++) {
tbl_b0[i].page_type = page_ptr;
***************
*** 770,776 ****
for (i=0; i<0xf; i++) {
tbl_bf[i].page_type = g_ci_page;
! tbl_bf[i].tbl_address = (long_desc *)((i << 24) | 0xf0000000);
}
tbl_bf[0xf] = tbl_b0[0];
*(ulong *)(&(tbl_bf[0xf].tbl_address)) |= 1;
--- 772,778 ----
for (i=0; i<0xf; i++) {
tbl_bf[i].page_type = g_ci_page;
! tbl_bf[i].tbl_address = (long_desc *)((i << 24) | 0xf0000000L);
}
tbl_bf[0xf] = tbl_b0[0];
*(ulong *)(&(tbl_bf[0xf].tbl_address)) |= 1;
***************
*** 830,837 ****
mark_pages(proc->page_table,0,mint_top_st,1,0,0,proc);
if (mint_top_tt) {
mark_pages(proc->page_table,
! 0x01000000,
! mint_top_tt - 0x01000000,
1,0,0,
proc);
}
--- 832,839 ----
mark_pages(proc->page_table,0,mint_top_st,1,0,0,proc);
if (mint_top_tt) {
mark_pages(proc->page_table,
! 0x01000000L,
! mint_top_tt - 0x01000000L,
1,0,0,
proc);
}
diff -c -r ..\orig\src/nalloc2.c ./nalloc2.c
*** ..\orig\src/nalloc2.c Wed Dec 23 12:45:32 1992
--- ./nalloc2.c Sat Jan 23 13:35:26 1993
***************
*** 25,31 ****
#define NALLOC_DEBUG(c) /* nothing */
#endif
! #define NKMAGIC 0x19870425
/*
* block header: every memory block has one.
--- 25,31 ----
#define NALLOC_DEBUG(c) /* nothing */
#endif
! #define NKMAGIC 0x19870425L
/*
* block header: every memory block has one.
diff -c -r ..\orig\src/proto.h ./proto.h
*** ..\orig\src/proto.h Wed Dec 23 12:46:08 1992
--- ./proto.h Sat Jan 23 13:34:14 1993
***************
*** 342,352 ****
int ARGS_ON_STACK ksprintf P_((char *, const char *, ...));
void debug_ws P_((const char *s));
int _ALERT P_((char *));
! void Tracelow P_((const char *s, ...));
void ARGS_ON_STACK Trace P_((const char *s, ...));
void ARGS_ON_STACK Debug P_((const char *s, ...));
void ARGS_ON_STACK ALERT P_((const char *s, ...));
! void FORCE P_((const char *s, ...));
EXITING void ARGS_ON_STACK FATAL P_((const char *s, ...));
EXITING void HALT P_((void));
void DUMPLOG P_((void));
--- 342,352 ----
int ARGS_ON_STACK ksprintf P_((char *, const char *, ...));
void debug_ws P_((const char *s));
int _ALERT P_((char *));
! void ARGS_ON_STACK Tracelow P_((const char *s, ...));
void ARGS_ON_STACK Trace P_((const char *s, ...));
void ARGS_ON_STACK Debug P_((const char *s, ...));
void ARGS_ON_STACK ALERT P_((const char *s, ...));
! void ARGS_ON_STACK FORCE P_((const char *s, ...));
EXITING void ARGS_ON_STACK FATAL P_((const char *s, ...));
EXITING void HALT P_((void));
void DUMPLOG P_((void));
diff -c -r ..\orig\src/realloc.c ./realloc.c
*** ..\orig\src/realloc.c Wed Dec 23 12:46:16 1992
--- ./realloc.c Sat Jan 23 13:36:00 1993
***************
*** 243,249 ****
#define PAD 256L
! long
s_realloc(size)
long size;
{
--- 243,249 ----
#define PAD 256L
! long ARGS_ON_STACK
s_realloc(size)
long size;
{
diff -c -r ..\orig\src/sproto.h ./sproto.h
*** ..\orig\src/sproto.h Wed Jan 20 15:22:32 1993
--- ./sproto.h Sat Jan 23 15:08:26 1993
***************
*** 17,25 ****
void ARGS_ON_STACK reboot P_((void));
short ARGS_ON_STACK spl7 P_((void));
void ARGS_ON_STACK spl P_((short));
! void ARGS_ON_STACK new_rwabs();
! void ARGS_ON_STACK new_mediach();
! void ARGS_ON_STACK new_getbpb();
/* quickzer.s */
void ARGS_ON_STACK quickzero P_((char *place, long size));
--- 17,25 ----
void ARGS_ON_STACK reboot P_((void));
short ARGS_ON_STACK spl7 P_((void));
void ARGS_ON_STACK spl P_((short));
! long ARGS_ON_STACK new_rwabs();
! long ARGS_ON_STACK new_mediach();
! long ARGS_ON_STACK new_getbpb();
/* quickzer.s */
void ARGS_ON_STACK quickzero P_((char *place, long size));
diff -c -r ..\orig\src/syscall.spp ./syscall.spp
*** ..\orig\src/syscall.spp Wed Jan 20 15:22:22 1993
--- ./syscall.spp Sat Jan 23 15:17:36 1993
***************
*** 58,63 ****
--- 58,64 ----
XREF _curproc
XREF _bios_tab,_bios_max
XREF _xbios_tab,_xbios_max
+ XREF _old_xbios
XREF _dos_tab,_dos_max
XREF _bconbuf,_bconbsiz,_bconbdev
diff -c -r ..\orig\src/util.c ./util.c
*** ..\orig\src/util.c Wed Dec 23 12:47:42 1992
--- ./util.c Sat Jan 23 13:32:02 1993
***************
*** 108,115 ****
*/
#define KERMEM_THRESHOLD QUANTUM-8
! #define KMAGIC ((MEMREGION *)0x87654321)
! #define NKMAGIC 0x19870425
void * ARGS_ON_STACK
kmalloc(size)
--- 108,115 ----
*/
#define KERMEM_THRESHOLD QUANTUM-8
! #define KMAGIC ((MEMREGION *)0x87654321L)
! #define NKMAGIC 0x19870425L
void * ARGS_ON_STACK
kmalloc(size)
***************
*** 142,149 ****
DEBUG(("kmalloc(%lx): nalloc is out of memory",size));
/* If this is commented out, then we fall through to try_getregion */
! if (!(m = get_region(alt, QUANTUM, PROT_S))) {
! if (!(m = get_region(core, QUANTUM, PROT_S))) {
DEBUG(("No memory for another arena"));
goto try_getregion;
}
--- 142,149 ----
DEBUG(("kmalloc(%lx): nalloc is out of memory",size));
/* If this is commented out, then we fall through to try_getregion */
! if (0 == (m = get_region(alt, QUANTUM, PROT_S))) {
! if (0 == (m = get_region(core, QUANTUM, PROT_S))) {
DEBUG(("No memory for another arena"));
goto try_getregion;
}
diff -c -r ..\orig\src/welcome.c ./welcome.c
*** ..\orig\src/welcome.c Sun Jan 10 15:32:58 1993
--- ./welcome.c Sat Jan 23 13:35:44 1993
***************
*** 66,72 ****
gl_lang = 0;
msg = &boot_it[gl_lang];
Cconws(msg->message);
! y = Cconin();
if (tolower(y) == msg->yes_let)
return 1;
else
--- 66,72 ----
gl_lang = 0;
msg = &boot_it[gl_lang];
Cconws(msg->message);
! y = (int) Cconin();
if (tolower(y) == msg->yes_let)
return 1;
else
diff -c -r ..\orig\src/xbra.h ./xbra.h
*** ..\orig\src/xbra.h Wed Dec 23 12:48:04 1992
--- ./xbra.h Sat Jan 23 15:04:00 1993
***************
*** 4,10 ****
long xbra_id;
struct xbra *next;
short jump;
! void (*this)();
} xbra_vec;
#define XBRA_MAGIC 0x58425241L /* "XBRA" */
--- 4,10 ----
long xbra_id;
struct xbra *next;
short jump;
! long ARGS_ON_STACK (*this)();
} xbra_vec;
#define XBRA_MAGIC 0x58425241L /* "XBRA" */